am 47d70030: Merge "Whitelist windows modules"

* commit '47d70030a603d359a89e06392415876f71756c0e':
  Whitelist windows modules