Merge "Put block cookie expiry into UTC for comparison with current time"