am 525098dd: Merge "Make wfd code work with both old and new dongles." into jb-mr1-dev

* commit '525098dd5442c66e9aa43ef15563fdae6d47ec9e':
  Make wfd code work with both old and new dongles.