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

Bug: 120848293
Change-Id: I42ca5fc87e33de6757f646f59ac3eeeaae7b7992