am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev

* commit '05f5cb45997fdc8831798bb84e50854cdfab2bcb':
  UsageStats: Gracefully handle corrupt filenames