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

Change-Id: Ia8b888d4d5d5cd6f33078acd5fcb78c4acf3ce5a