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

Bug: 120848293
Change-Id: Ic4ed4da083cd539a1daea509840cd37248dad8e9