Merge changes I24d33b94,I9db3c5d1 into rvc-dev am: ade62d5627 am: 9376dbc465

Change-Id: Ic1eae11fac9562ca3ce7044f38a4e8e1ccbaa4cd