DO NOT MERGE - Merge QQ1A.200205.002 into master

Bug: 147428392
Change-Id: I37f2fe376d2feaf5e6e3e640c3eef6bb42f14c52