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

Bug: 120848293
Change-Id: I0c94e75f88af96a23545a07f8dade83d7b92d169