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

Bug: 120848293
Change-Id: I007219bfc21655c92b31f76ec41ea714426760d2