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

Bug: 120848293
Change-Id: I2516ba0c0bd728d9132b9551179180c8132153d2