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

Bug: 120848293
Change-Id: If4dc8732fa945641ee35d806fb60c20f394f06a0