Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev