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

* commit '905dc8b76a98268a8047358ac55e14b4db18de8b':
  Whitelist windows module