Merge changes I1169beb3,If7c7b737 into rvc-dev am: 0fd43f11e8

Change-Id: I4c24f5095ae4c0440dcfb15f7baffa0cc723ab76