DO NOT MERGE - Merge QP1A.191005.007 into master

Bug: 142297020
Change-Id: I22d6710463c60370637bef0ecd560168663cad77