Merge changes I23fdfa3a,Ibe43fd74 into rvc-dev am: 49f0b3e2 am: 34db4a60 am: 3103b00a am: a1be10d3 Change-Id: I79e50917b6775133249215cbd5f83be02f394348