internal merge of PR #1171
internal merge of PR #1171

PiperOrigin-RevId: 219151604

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