Merge "Fix import order in atoms.proto"