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

* commit 'e3cceef7ececdac1c6df65d3f7a1557ac3ce5e3c':
  Minor cleanup of UsageStatsService