am 926bec19: am 2b44bd54: am f6c1543c: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 5295dc6 automerge: 85cd818

* commit '926bec19b068a468b64e281abebe7ee255e7b9db':
  Support WiFi only device at runtime.