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

Bug: 120848293
Change-Id: I0c3e8385af9f47d883eeef2448855f0a37bf58ee