Merge "Remove redundant interfaces from v3 identity client"