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

Change-Id: I14fba880760667d8d7c6493a4abc43196c2e8181