Fix friend import for existing peers

Change-Id: I3349d345663025f39ac59e45314965cad6515803
Fix reverse probe.

Change-Id: I960d177d4e9dc794434afdeef905dc8d00bc6c24