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

Bug: 120848293
Change-Id: I71b5c3955ffea49c25e26a1826999b0210a29a5c