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

Bug: 120848293
Change-Id: I2e3c4c07e51379d4c03701244c2e45306ea1fafd