Merge "allow use of atom definition outside of atoms.proto in pulled atoms"