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

Bug: 120848293
Change-Id: I4b14727a88dab59e88a62b5cec751e47a3e84637