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

Bug: 120848293
Change-Id: Ia8706ea0d95be1649f30744bd3d01e487810a0bb