Merge "Drop remainders of identity API v2.0 references"