am 3e5e615f: am 46679c1d: am 8d35442b: Merge "fix windows build"

* commit '3e5e615f75ec08b9c6522e552ea98c0615146924':
  fix windows build