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

Bug: 120848293
Change-Id: I8a233d8c8427f0e24b01f86f1c00a03744b8971c