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

Bug: 120848293
Change-Id: I4029675ab6a04d36baf8a44fa4aba3453b38a1c0