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

* commit '4888b8ef094d457f4eec9ee2c4a92be5dc1aa847':
  Whitelist windows module