Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty.
This often occurs after an incomplete reboot/shutdown or battery pull.

Change-Id: I4f01151f4051df4ae1b85fa460ec7a9e70122878
Parse UUID string with Long.parseLong

Integer.parseInt throws an NFE for values greater than 0x7fffffff.

Change-Id: I1fb9e4980b2058a4071dd80d0b9abd8efeb870ab
Merge "Parse UUID string with Long.parseLong" into cm-11.0
core: added national roaming info for Free Mobile in France

  Users of Free Mobile in France (MCC 208 MNC 15)
  can roam on Orange (MNC 01)

Change-Id: I2c0c3940a72262b1257fb1c2dfdd01da652d2959
Merge "Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty. This often occurs after an incomplete reboot/shutdown or battery pull." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0