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

Change-Id: I5eccf9672d7884702de2f9f6f84f2824e28f992a