Update Health Check

Change-Id: I526550685e50177bc1c1957e9e4fc2b42b64177c