am b94de814: Merge "UsageStatsService: Update file index to prevent double...
am b94de814: Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev automerge: 96f635ed
* commit 'b94de814':
UsageStatsService: Update file index to prevent double checkin