am 84494473: am aaa9d8dc: Merge "Fix windows build"

* commit '8449447384a882e302861892ea6edf92ebd4d55e':
  Fix windows build