Merge changes I3f912418,Idd2465d5 into rvc-dev am: b010fc5534 am: 50c05bdbf7 am: 49e26c985d

Change-Id: Ic80c780260271069ae6e971f6508b925a70c4449