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

Bug: 120848293
Change-Id: I40f352fd88fb4ebda716fdc664c54c07b3ec8d34