am efd8a85d: Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev

* commit 'efd8a85d30c35ca4a274835f10e371289bb9bc5e':
  Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService