Improve on_health_ok callback

Change-Id: Ie672c713697b3048eaccca1a6c7c94cf0a6de5a3