am e3082990: am e917d8ed: am 9336ee38: Merge "Fix (Windows) build."

* commit 'e3082990cd205ac0b068f546d8344ffcf4c97c6d':
  Fix (Windows) build.