[automerger skipped] DO NOT MERGE - Merge QQ2A.200405.005 into master am: 9d48fd3b30 -s ours am: 8c9a92e1b3 -s ours

am skip reason: Change-Id Ica54841cbc81b29c4b3bfa0b58f94a0f82de300b with SHA-1 4c2000cb4e is in history

Change-Id: I9738d4d0520f41244a6f59f9cfbdd66c717eba93