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

am skip reason: subject contains skip directive

Change-Id: I7b7b9e80d530c934c814c00463314b28c4a78a90