am 438fb54a: am 91211df6: am e63d3144: am a403d5cc: am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev

* commit '438fb54a2684c766617784d4072eea36b133784e':
  UsageStats: Gracefully handle corrupt filenames