Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev