DO NOT MERGE - Merge QQ1A.200205.002 into master

Bug: 147428392
Change-Id: I7939379e221123a74b387bf78ce90d68e0468ff0