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

Change-Id: I5d2b75d483e0963a414245cb2ae9c77afbd31f1b