Fix cookied-mcp-queens-*

Change-Id: If2153f1d723a72ee6c7f6b6ea91504f255ac81a7
14 files changed