DO NOT MERGE - Merge QQ1A.200205.002 into master

Bug: 147428392
Change-Id: I69a28f105fe4d2721a81de40db49f3a2619744b2