Merge "Fix identity tests when domain specific drivers are enabled"