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

Bug: 120848293
Change-Id: I106acb23a6958e2c84619bc787cd700f5120e84c