DO NOT MERGE - Merge QQ2A.200405.005 into master.

Change-Id: I9e993006d3da0da017cbc69df90d5bda826be12d
Merged-In: I2f206fcec7815bb9c291db521e1de117aab08f95
Merged-In: Ic31fef9d9c105a3cfc4911beed19b5af7fc702e5