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

Bug: 120848293
Change-Id: I0bbf5699028390f30e0c6430e827b5a679a8b29e