Merge "P2P: Use P2P Device ID attribute if Device Info not available"