Merge "Change location of healthd"