Merge "Remove already-deprecated strict_policy_check option"