am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f

* commit 'f6915b6f02ea3ff39bab6bd993072c323f470f27':
tree: 7ed1e5c4cbce62e5bca4103e4b76c8fbac5d2e67
  1. tests/