Merge pull request #30724 from jbedorf:fix_30440

PiperOrigin-RevId: 258819909
This commit is contained in:
TensorFlower Gardener 2019-07-18 12:59:28 -07:00
commit 7dfc439541