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

Bug: 120848293
Change-Id: I29908a680f31b3eebb9716ac81f51b21708cda7c