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

Bug: 120848293
Change-Id: I4e73529e07d48dba3339851f2ce4a52354fd25bf