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

Bug: 120848293
Change-Id: If0bffae8a1fa2925107f9c4c5cf8f198a90b3188