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