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

Bug: 120848293
Change-Id: Ib329bc28850268d88478fbc207e915f4c41962eb