internal merge of PR #1271
internal merge of PR #1271

PiperOrigin-RevId: 224227181

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