Merge "Fix the integration issue for HAL 2.2"