am a0c61efa: am 03c26b27: am 596fd38a: Merge "Whitelist windows module"

* commit 'a0c61efab913bc91f65b427ade0b879c701e5c8f':
  Whitelist windows module