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

Bug: 120848293
Change-Id: I47d7efdea2e8c1bbe7e6a32c49a1bc25030517cc