am fe54df2a: am 905dc8b7: am ce92141c: Merge "Whitelist windows module"

* commit 'fe54df2ad3244d1cb745a6aac868654f0fc05315':
  Whitelist windows module