internal merge of PR #1098
internal merge of PR #1098

PiperOrigin-RevId: 214947171

tensorflow/tensor2tensor,tensorflow/tensor2tensor,tensorflow/tensor2tensor,tensorflow/tensor2tensor,tensorflow/tensor2tensor