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

Bug: 120848293
Change-Id: Ic40de7600a0242c71a624a0ecc3506dcde016f1b