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

Change-Id: Ideac1070ff5634af2a7a90981fb3092f78997db0