am aa87b6d1: am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
* commit 'aa87b6d1ce1ae0cc0db88b6a5bee8e857c0803af':
This commit is contained in: