Merge "healthd: Fix incorrect return check" am: ec56c59dbb
am: b4bd2480e3

Change-Id: I0be5f079cdf4aea182c67ac98952bf7ec5b5658b