DO NOT MERGE - Merge QQ1A.200205.002 into master am: 5d4361bfb3

Change-Id: I62aedcc9229a0687747969931e15fa3d4dbfc1b8