am 5d6f0a16: Merge "Remove / re-word some settings for WiFi-only devices." into honeycomb

* commit '5d6f0a16bbe7efb4db8c43ceb8e0058b5228d5c2':
  Remove / re-word some settings for WiFi-only devices.