internal merge of PR #1291
internal merge of PR #1291

PiperOrigin-RevId: 224904504

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