Merge "Convert domain verify dev errors to IllegalArg" into sc-dev