Merge "Revert "Delete atoms.proto from statsd""