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

Bug: 120848293
Change-Id: Ie75163fd6931e11e25ebf0467687a484af9a66aa