[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 80d1724769 -s ours am: 61c81af99a -s ours

am skip reason: subject contains skip directive

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0de9dd56df19aa59bd0dcd9582854814cdd9e7ca