message: Change to use shuffle_ops._ShuffleAndRepeatDataset directly
  based on review feedback
diff: @@ -208,11 +208,8 @@ def _maybe_shuffle_and_repeat(
  dataset, num_epochs, shuffle, shuffle_buffer_size, shuffle_seed):
  """Optionally shuffle and repeat dataset, as requested."""
  if num_epochs != 1 and shuffle:
  - # Use shuffle_and_repeat for perf
  - def _apply_fn(input_dataset): # pylint: disable=missing-docstring
  return shuffle_ops._ShuffleAndRepeatDataset(
  - input_dataset, shuffle_buffer_size, num_epochs, shuffle_seed)
  - return dataset.apply(_apply_fn)
  + dataset, shuffle_buffer_size, num_epochs, shuffle_seed)
  elif shuffle:
  return dataset.shuffle(shuffle_buffer_size, shuffle_seed)
  elif num_epochs != 1:
  