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

Bug: 120848293
Change-Id: I1a9feb2ffb406abd4a481b4b6c3d41869c8d1c4d