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

Bug: 120848293
Change-Id: Ic69a11be3b82fddd59d6fd53dc3eff6617e65c2a