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

Bug: 120848293
Change-Id: I1e18e9623f8ead91fe29d121b6899d2ad8625e5f