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

Bug: 120848293
Change-Id: I260bccb8bf0bd19423b992f1d05a3fc3b1b9a28f