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

Bug: 120848293
Change-Id: Ifd28bab426a29d2b55400cafc387e287a7e46b86