Merge branch 'r1.9' into r1.9
authorGunhan Gulsoy <gunan@google.com>
Fri, 6 Jul 2018 16:32:55 +0000 (09:32 -0700)
committerGitHub <noreply@github.com>
Fri, 6 Jul 2018 16:32:55 +0000 (09:32 -0700)

Trivial merge