Merge "Add health 2.1 HAL"