DO NOT MERGE - Merge QQ1A.200205.002 into master

Bug: 147428392
Change-Id: Idd35f9e9df48ed9909b338325dd15b670da492e7