DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I52dfab484a08e8c1e3128624a8290079ede51ba9