NXP-10781: more local_root removals