Merge changes I815bb92e,I1777f84c into rvc-dev am: f5f588e032 am: 86ff244d06 am: 0fa47d4a9c

Change-Id: I22191f685cabc88e4346464ebcb695dbbb00528a