Merge pull request #19788 from av8ramit/cherrypicks2
authorAmit Patankar <amitpatankar@google.com>
Tue, 5 Jun 2018 23:41:19 +0000 (16:41 -0700)
committerGitHub <noreply@github.com>
Tue, 5 Jun 2018 23:41:19 +0000 (16:41 -0700)
Cherrypicks2


Trivial merge