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

Bug: 120848293
Change-Id: Ia668d1952f5cfd256ce9734b52ffbf5c5d97f5d5