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

Bug: 120848293
Change-Id: I4a2f2fde49a4ed8c13548a1b6f8ed822a3bbdd8f