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

Change-Id: If1bb8890e6fa70c022ca4e904cfeef54b010798b