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

Change-Id: I26be2b5a316516af3556d0e6f80abf4b36942b70