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

Bug: 120848293
Change-Id: Ib7f5d3fc523c1643850b28723645cc3ecee6c5df