Merge "[fuel] cleanup: Drop infra_compute_*_address" into stable/euphrates