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

Bug: 120848293
Change-Id: Ia84b64c1dd85578e9bd6446071ffff2101a8d128