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

Change-Id: Ic9075c19485c34cf83e70f462958f5223d411037