internal merge of PR #1302
internal merge of PR #1302

PiperOrigin-RevId: 228581110

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