DO NOT MERGE - Merge QP1A.191005.007 into master

Bug: 142297020
Merged-In: I77aa6d15a81bd63bfdb03a36ef73c9bf8a148cbb
Change-Id: I99023ddd9f6672b79b23729ee9426ce0a277837b