Merge "wifi: Remove internal function, add version checks when using new API"