Merge changes Ifb23a73a,If1854a77 into rvc-dev am: 9d3317b8da

Change-Id: I755b491fbde051441b58da724770507980b5fb6f