Merge changes Ibe02e76d,Ibb542595,Ic63aba39 into rvc-dev am: db283837dc am: dc67deb3ea am: f1aba890f1 am: 37f5194bd6

Change-Id: I62c15b7c1b897d02cc1db83e1399baad86c1c8c2