DO NOT MERGE - Merge QQ2A.200405.005 into master

Bug: 150877681
Change-Id: Ib0929861836cfd12fa29cc371c461355ef832173
Merged-In: Ica54841cbc81b29c4b3bfa0b58f94a0f82de300b