Merge "Add tests to cover policy_dscp_marking_rule"