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

Change-Id: I587bf100e4e48d3d1fefa28c1948397791071baf