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

Bug: 120848293
Change-Id: Ia233277c4aea83e44ef8148674d2bb5520198f5b