am 5fc83065: am 7bd30b73: Merge "Whitelist windows module"

* commit '5fc83065f6d7f6277cbaa58570c8bfd22456a003':
  Whitelist windows module