Add default health service am: 6e0d4a3109
am: e677558f83

Change-Id: I8aaf8d10fd0b9ecc9ad43fc37a8993e226453a1c