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

Bug: 120848293
Change-Id: I99cfd48e17ee28ee0d644aed0f11b71fb14277c0