Merge "Fix integer overflow in time conversion"