Merge "Add null check on getting p2p iface name"