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

Bug: 120848293
Change-Id: I970e7d6e88c071ed815169f3249965d490dca2d7