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

Change-Id: I169c8dd2793e219c4a474ef26b68445dd13bf5c9