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

Change-Id: Id711d8b98ab8e3531a51ca5c521acef48254b3cb