Merge "HAL changes to remove the carrierId"