Merge pull request #16729 from jhseu/bug_fixes
authorAmit Patankar <amitpatankar@google.com>
Sat, 3 Feb 2018 19:00:37 +0000 (11:00 -0800)
committerGitHub <noreply@github.com>
Sat, 3 Feb 2018 19:00:37 +0000 (11:00 -0800)
Fix the Windows GPU build


Trivial merge