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

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