DO NOT MERGE - Merge RQ2A.210505.003.

Bug: 187544653
Merged-In: If20b09b785410d0493c706eeab32f9ed83069b97
Change-Id: I662ab0ccd0206cbbcb2d05b80fe336d2be2f8c13