NXP-11170: update drive edit handling to take the new fs ids into account