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

Bug: 120848293
Change-Id: Iffadcb733dfe5e268c4272a76214f890318f2f87