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