Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev am: 33cf9d091c am: 940d7f37b3

Change-Id: I4b6eb1329ca0b40cd2d93804805f8144ccfffc35