[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: d95545fc81 -s ours

am skip reason: Change-Id I4e5b07e96a1ddc23057b373a1ff7d9f54ae361bb with SHA-1 fcfd5b554a is in history

Change-Id: I18b4615d67d4814ed2f6394d2dca00e35485bb48