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

Change-Id: I6b5f4a22df58528681e63e8631b1e3f4d659a5ad