Merge "Fix typo in atoms.proto"