Merge changes I815bb92e,I1777f84c into rvc-dev am: f5f588e0 am: 86ff244d am: 0fa47d4a am: 200ab0fe Change-Id: I528ad6f90ea44ab3b3a5c36f0ce287af2b2daca2