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

Change-Id: I392a6c45423b9ed7720a6014059b81144b56ff9c