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

Bug: 120848293
Change-Id: If84002cb9a9545b327c3ee528102ac041b945a22