Merge "Replace deprecated atoms.proto file path"