Merge changes I23fdfa3a,Ibe43fd74 into rvc-dev am: 49f0b3e281

Change-Id: Ic02da6a9cfffdca4e3cabbc31b3eff015f90e33f