am d292caf4: Merge "Support WiFi only device at runtime." into jb-mr2-dev am: 7d72bf5622

Original change: undetermined

Change-Id: I620b1b28e0766904d4b629918f6a7d72307a9985