This is a no-op change and just moves some duplicated logic into the base class. PiperOrigin-RevId: 294615218
