Merge "wifi: remove wifi instance name string check"