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

Bug: 120848293
Change-Id: I1aa111672a9dfdb831a23fb91ea931f3ea2ce711