Updating service with new health checks

Change-Id: If05ae25142942967fa020c62c403a4d336570b72