Merge "healthd: Fix incorrect return check"