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

Bug: 120848293
Change-Id: Ifde0e7dd0896f48be8975b153a07953bcea72656