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

* commit 'f056ab504b47e56616689df10e8d89277f09e447':