internal merge of PR #1159
internal merge of PR #1159

PiperOrigin-RevId: 218238281

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