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

Change-Id: I0be54e258a541d2e0b1c650939ba957a595f8499