Merge changes I24d33b94,I9db3c5d1 into rvc-dev am: ade62d5627 am: 5dcacf7967 am: 5a69f3ac9b am: 4c3b25c53f

Change-Id: Ie7c55166f7101e8a89d2bc4ee7c1e7a21d2498b4