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

Bug: 120848293
Change-Id: I3d011be24e08d64b57ec1e7856b67fa7136614e1