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

Change-Id: Ifa4d5b1872cf5d93f8c389b6912306d6f72e78dc