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

Bug: 120848293
Change-Id: I0a9cd456d715f38f313f9ab55b8583c08ffb387a