Merge "More wifi direct CTS tests" into jb-dev