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

Change-Id: I79aaf37a4fe2391018ae3464660e1b96344a1e93