Merge "Use policy-id instead of name"