Merge "healthd: overridden by health@2.0-service"