Merge "Add annotation to atoms that represent a state change in atoms.proto"