internal merge of PR #1216
internal merge of PR #1216

PiperOrigin-RevId: 221136178

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