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

Change-Id: Ia4576a51c1fbff9998bf1ca8d61a0edc7ac76c7b