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

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