Merge changes I25df8eec,I493ff192 into rvc-dev am: 312bc65194

Change-Id: I3ffd400a856a71ee3e90c3c749b40eb285a98184