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

Bug: 120848293
Change-Id: Ia237183637cd6ba3d1da2954ac1bb8c195105b13