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

Change-Id: I78d9186df18be2372539f4d88ea287bb29646285