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

Change-Id: I64cbf5bf97d7b27211e9c34c607f0a51c3c0a35e