Merge "Add UT for HealthCheckHandlerTest"