am 2de2e225: am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit '2de2e22540441fd02e03abae5bcae8feb873b929':
  Minor cleanup of UsageStatsService