Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev am: 7499783fd9 am: 6e95b881aa

Change-Id: I10a8297ec2259bcabefc5b1a6229503db75eb9e7