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

Bug: 120848293
Change-Id: Ice2afeec46376d01d345a74a95d941fde2771b68