DO NOT MERGE - Merge QQ2A.200405.005 into master

Bug: 150877681
Merged-In: I9425baa21c82d5a5edf37c87989adbade0428b67
Change-Id: I1bb8ab72286578d07cfd23fdad1f0ddc17949db6