Merge "P2p API for WFD" into jb-mr1-dev