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

Change-Id: I9bebe4cd5d30b553d92b7a8e9a9816e1a5a8a3fb