am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev

* commit 'deee5566417af229a142cf8c1964e98a356513e4':
  Make default windows features configurable.