Merge "Updates statsd atoms.proto with small changes."