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

* commit '03c26b274aed35c0a580b309567264d00cb643f2':
  Whitelist windows module