am a8dfc9ac: am aa87b6d1: am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev

* commit 'a8dfc9acfe032ac10e398c1e809e61a1b00d26e4':