Merge pull request #19999 from akshaym/cherrypicks_34G4G
authorMichael Case <mikecase@google.com>
Wed, 13 Jun 2018 22:11:07 +0000 (15:11 -0700)
committerGitHub <noreply@github.com>
Wed, 13 Jun 2018 22:11:07 +0000 (15:11 -0700)
r1.9-rc1 cherry-pick request: bugfix/memory leak fix


Trivial merge