internal merge of PR #1369
internal merge of PR #1369

PiperOrigin-RevId: 229278674

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