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

* commit '36fe96be7ccf388f27bb98859f89aff13cdc6e11':
  Support WiFi only device at runtime.
tree: 40b11b88f7fb23e8d07a1e98c996205bd0555f6b
  1. core/
  2. services/