am 9cc3c31b: am d5a74c1a: am b4fbcca4: am f4def3f7: am 832ca416: am 8acac4d0: am 4ab57130: am 35b41c0c: am b75b6794: am ebad7300: am 45643db7: am 03786bc4: am 5295dc65: Merge "Support WiFi only device at runtime." into kitkat-cts-dev

* commit '9cc3c31b49364542356518115614f906f9225f5f':