DO NOT MERGE - Merge QP1A.191005.007 into master
am: 272ecdce0b

Change-Id: Ie04781fc9e73dac178495bbc1e031f868d36f90a