Merge "Don't crash the system server when a misconfigured agent adds a DSCP policy" into main