Merge "Fix timeout issue when cert service is unavailable"