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

Bug: 120848293
Change-Id: I59ed89b1f8b35f8805f21b6317b787d9bc058b14