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

Change-Id: Icb48a402b873cac6fe7d84be081fbf0ec0a79521