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

Change-Id: I3f69fd27d99624bff80d2e269384edb8336503b8