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

* commit 'f6915b6f02ea3ff39bab6bd993072c323f470f27':