Merge "Fix 6GHz support for NAN"