Merge "Wifi-Hal: Fix Nan capabilities mismatch"