Merge "Support WiFi only device at runtime." into jb-mr2-dev