internal merge of PR #1390
internal merge of PR #1390

PiperOrigin-RevId: 230363031

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