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

Bug: 120848293
Change-Id: I6c3b67eb9a11ea0cd414ecdbf10d6b14450a53c5