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

Change-Id: Iaff01e2104e41a022ad6c9aae14cb7b69d5fdbc2