Merge "Add support for changing p2p device name" into jb-dev