Add default health service am: 6e0d4a3109 am: e677558f83
am: 7d098a3f60

Change-Id: I4b4f986de55ff6af4616f1ed2be73f790407aea1