Merge pull request #590 from google/winterfroststrom-patch-1

Fix windows cbuild pytest pytype error