Merge "Fix expiry checks in HttpCookie"