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

Change-Id: I7e03fcdb4ffd939567ac70861a965cc296299855