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

Change-Id: Ie7a29679a51049acfa04667270ad5fd3ce41cef0