unstable commit - starting work on wifi p2p discovery