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

Change-Id: I642d4eb829a3312028cfa35b76292a3ff1debc90