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

Bug: 120848293
Change-Id: Iba78ed9cffb5529ed128a21bd1732201dda7e638