Merge changes Ida1281a7,I70398d46 into nyc-mr1-dev

* changes:
  Prevent Data Usage Settings crash on phones without cellular history
  Data Usage summary creates a dialog to change data warning level