am 124fce2b: 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 '124fce2b':
Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService