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

Change-Id: I1018d5fb995dc0a20528981795b0eb1596d5c94a