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

Bug: 120848293
Change-Id: I33f16a1177ac7c5c35f095240e91d04da9552281