Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev am: 33cf9d09 am: 940d7f37 am: 9fee1c60 Change-Id: Ib2f17bd9eae61e174414cc23c655efe0134d3dbc