DO NOT MERGE - Merge QQ1A.200205.002 into master

Bug: 147428392
Change-Id: I01afc43a2d99aeaf8207280e185adf461a2f7c99