DO NOT MERGE - Merge QP1A.191005.007 into master

Bug: 142297020
Merged-In: If66f00aac018515b8d5774e07ca4cc7911b288fc
Change-Id: Ic46ba8bae31dbd6b0a49979a283aaa9d3059220b