Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev am: 33cf9d09 am: 940d7f37 am: f7a7f2c5 am: 2f45c600 Change-Id: I90ba8898e3f1d111d376e312c0979e88fb33e28d