Merge changes Icda006de,I3590beeb into rvc-dev am: 6a6d06f5ba am: 359c819cd2

Change-Id: I918d2520d2ac0a90336afd25af857db169879026