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

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