Health check tab behavior fix

Closes-Bug:#1337811

Change-Id: I131f4eb6ffd8180fd9d82f6c640c28e0d36f261e
Merge "Health check tab behavior fix"