Bug 960790: Fix P2P presence discovery handling.
Merge pull request #15531 from svic/Bug_960790

Bug 960790: Fix P2P presence discovery handling.