DO NOT MERGE - Merge QP1A.191005.007 into master

Bug: 142297020
Change-Id: I95c78bcad5c3ec4b711b674a3a1ae6612e5dc331