DO NOT MERGE - Merge QP1A.191005.007 into master
am: 520d2cd5a9

Change-Id: Ic2b3696a9132db509d1ffcb47c072e247e81f079