am d558530b: Merge "Fix Windows build."

* commit 'd558530ba90cb6218fe8e255c71a034c3fe1ea58':
  Fix Windows build.