Merge branch 'r1.9' into r1.9
authorAmit Patankar <amitpatankar@google.com>
Fri, 6 Jul 2018 20:11:25 +0000 (13:11 -0700)
committerGitHub <noreply@github.com>
Fri, 6 Jul 2018 20:11:25 +0000 (13:11 -0700)

Trivial merge