am a471c1b8: am 47d70030: Merge "Whitelist windows modules"

* commit 'a471c1b8a417c6c393918315beba1595e43a04a7':
  Whitelist windows modules