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

Bug: 120848293
Change-Id: I6f90efb3099753773b80a4b4083bd7af56338c35