Merge "wifi adapter cleanspec"