Merge RQ2A.210305.007

Bug: 180401296
Merged-In: I5c36ecbac4c423627c8cab1b65a6e77bde5bd55b
Change-Id: I586b0af8bfc298d35f6570723db7015ddf621278