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

Bug: 120848293
Change-Id: Iad03f82ff3d93269ba55e95123f975f333e9a60f