DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f

Change-Id: I6aca2687101666e27b3a20d0dc54bad50739cfb1