Merge changes from topic "revert-10602670-XFOJAPBNWU" into rvc-dev am: 18cf5cd605

Change-Id: I64fafdca7366ee47c9baa8fdced9b2393e7ee5dd