internal merge of PR #1358
internal merge of PR #1358

PiperOrigin-RevId: 228735764

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