am 8d35442b: Merge "fix windows build"

* commit '8d35442b18e9dddfdde89c81e0cc910c70a12202':
  fix windows build