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

* commit 'e148a49d9214724c7c6aa5b23eae7cdbb80da1ca':
  Support WiFi only device at runtime.