Merge changes I23fdfa3a,Ibe43fd74 into rvc-dev am: 49f0b3e281 am: 34db4a60cb am: 3103b00a3b

Change-Id: I64d687ba61c7ff2e14444b0d947f2df46a61a85e