internal merge of PR #1318
internal merge of PR #1318

PiperOrigin-RevId: 227921102

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