Some usage of += had to be changed to use .add because GString can be implitly converted to String and back, but it is not the case for List<GString> and List<String>. PiperOrigin-RevId: 368416727
