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

Change-Id: I6049bdf33d4ec194aeae29a6108571cf81100fa6