Merge changes Ifb23a73a,If1854a77 into rvc-dev am: 9d3317b8 am: d318730c am: bd332dff am: 621f940b Change-Id: I48e22343f967dfb914eaadae98b483b9da15c0aa