internal merge of PR #929
internal merge of PR #929

PiperOrigin-RevId: 221513658

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