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

Bug: 120848293
Change-Id: Ifd5971323e387e93d93b0389ddcbcb0754b8cd66