Merge "Adding availability HAL support"