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

Bug: 120848293
Change-Id: Iedda81dc94d19cd69a67f28d4f6344ea4e490b10