Merge "Fix Statsd rejecting configs"