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

Change-Id: I28046e1355e5c9a49f4246e7c5588e6a5d21470f