Merge changes Ib293173b,I9244baf7 into rvc-dev am: 05331bc94b am: 93e313811c

Change-Id: Ifd47521071a2e8f87e9f48b0728c4cdbc1bedd9c