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

Bug: 120848293
Change-Id: I34602dba228f5f8cf67d39a5e295a80c5db76875