Make the fix specific only to List Manager.

GCP-8599.

Reviewer: Darla