internal merge of PR #1224
internal merge of PR #1224

PiperOrigin-RevId: 225268329

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