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

Bug: 120848293
Change-Id: Ia889295ca47734bc8c665f88fb42b3ee5d10f4b3