NXP-16200 fix multi-repo support