Merge changes Ibe02e76d,Ibb542595,Ic63aba39 into rvc-dev am: db283837dc am: dc67deb3ea am: 34f0dbe2b4

Change-Id: Ieedc2ee10cdac795a986f0f92b08844edbb8100f