am 84363e91: am 316ed876: Merge "Whitelist windows modules"

* commit '84363e91550985b80116a906c49fa150743c58b1':
  Whitelist windows modules