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

Bug: 120848293
Change-Id: Ifbae4d323a754181851a4eaa0313dcd45c8bfa19