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

Bug: 120848293
Change-Id: Ia8978f0aee8006cb6ea17984a45b94b518b61e19