Merge "Fix UsageStats to report correct endTime from XML"