Merge changes I7f8339d8,Idff0c394 into rvc-dev am: 686dac0cdb

Change-Id: If597e6b6a35e038c90090614dbdda35b0b5ce854