Merge "[POLICY] Fix the policy-clamp stage jobs"