Change-Id: I2f7e38e2726df641089e291725bc25904ac35537
Encourage WiFi usage first, and let folks with limited sim plans make the choice to enable Change-Id: I9529d85f3d22af73b9baf255d47681ec43089b14