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

Change-Id: I6867381494ffc4badfa84623d55e8b35ddcc6d17