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

Change-Id: If325c31e261487a7adaf3ee99c4655ab15f88df0