Revert "Trimmed the branch to only the bwi_desktop sub directory"

This reverts commit eaf968d77d86db570737284135d153b7cb39b078.
Rebase from 'upstream'
Trimmed the branch to only the bwi_desktop sub directory