Merge "Remove DataGenerator from admin V3 identity tests"