Merge "wifi HAL uses "default" service name"