Merge changes I3f912418,Idd2465d5 into rvc-dev am: b010fc5534

Change-Id: Ie00d6a9cae08e0d5c96bf064cfb4d7d925e92d1d