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

Bug: 120848293
Change-Id: Ic36c077dcd8b46b1783b561b7f3c31a7da91c1d5