Merge changes Id928678b,Ic55dbbe6 into rvc-dev am: 4915739873 am: e067ac65f2 am: b3f0e2de1b am: 0bc8e12704

Change-Id: Ic714c1b757db74621de9ffc322e7494e3dc70228