Merge changes I7bb9d561,I2748d4a7 into rvc-dev am: 0df912df57 am: 07cf4177d3 am: b5833487dd

Change-Id: Ic2eead8eef28b029241404ffb06c7383b0d05e8f