Merge "Support the Carrier WiFi for Provider Model"