Merge "services/identity: Give Identity Service a makeover."