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