am dcbeb41a: am d558530b: Merge "Fix Windows build."

* commit 'dcbeb41a673e3fa6eb8344e9c806cb8a5f7eeff5':
  Fix Windows build.