DO NOT MERGE - Merge QP1A.191005.007 into master

Bug: 142297020
Change-Id: I8ee6a4e97c145226a5a943a0882925c8c9525c81