Merge "healthd: add stem to health@2.0-service.override [DO NOT MERGE]" into pi-dev