internal merge of PR #1184
internal merge of PR #1184

PiperOrigin-RevId: 219520594

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