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

Bug: 120848293
Change-Id: Ib1bcf352079c36a81dfb676795cafc6c91f6a9a3