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

Bug: 120848293
Change-Id: If2f995b2b0e9c077ffd93b78cc4c21cad4c2f2a4