DO NOT MERGE - Merge QQ1A.200205.002 into master

Bug: 147428392
Change-Id: I92ed91736a7fdb8f03a720d945f859cc49b430ac