Merge changes I3f912418,Idd2465d5 into rvc-dev am: b010fc5534 am: 50c05bdbf7 am: e3226d6c73 am: 7ffd22dc5c

Change-Id: I1b17e3452a2aa6e773497e669a694a444d72cb1e