Merge "UsageStats should deal with changing time" into lmp-dev