Merge "Always search for p2p target in discovery list."