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

Bug: 120848293
Change-Id: Ib64cb66450722fc5d4ce8b3ce0ebae7f68934d0a