Merge changes I977507a8,I3f2670c7 into rvc-dev am: b6ddea2951 am: 9f8a432b15

Change-Id: I89a6219f8c53b67a5d56a726fbf0a50f2aec86b5