[automerger skipped] DO NOT MERGE - Merge QQ2A.200405.005 into master am: aff94c81d2 -s ours am: 739398a1fd -s ours

am skip reason: Change-Id Ica54841cbc81b29c4b3bfa0b58f94a0f82de300b with SHA-1 72c99c8518 is in history

Change-Id: Ia796b6eeb1dd672a0cf2162c5ebc60975642a17b