internal merge of PR #1078
internal merge of PR #1078

PiperOrigin-RevId: 214280739

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