Merge changes Ie3669798,I4b34cc34 into rvc-dev am: 4ac0f0f3ae am: db89bd9496

Change-Id: Ib6fab6b6bbbb1300254409351324da2ad5d6a1c3