Merge changes I977507a8,I3f2670c7 into rvc-dev am: b6ddea2951 am: 9f8a432b15 am: 14e67342a6 am: 920a3cf0da

Change-Id: I4912ead1cf029223399ebcef097f55408d27828b