Merge "Move statsd metadata from statslog to atoms_info"