Merge "Fix determining request expiration time"