Merge "Fix testExplicitHealthCheckFailureBeforeExpiry"