am aaa9d8dc: Merge "Fix windows build"

* commit 'aaa9d8dc0aba0446fb11238f2aa869ce0b33df2f':
  Fix windows build