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

Bug: 120848293
Change-Id: Ied1ad87738d09b76ad526530db3a9a016e864c55