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

Bug: 120848293
Change-Id: Ic0b615c2ddaa96291edc3be2a35bf1b0390aba92