Merge "Support WiFi only device at runtime." into kitkat-cts-dev