Merge "Surface HAL constants"