Merge "Fix the policy_id not set"