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

Change-Id: Ibdf6cc5f79dfccbcc52581f03376c2ddd1aa15ae