am ce92141c: Merge "Whitelist windows module"

* commit 'ce92141cbdfeae302fcc1d5e4b4b261c783feaf7':
  Whitelist windows module