Merge "Updated to return INVALID_ARGUMENT on generateKey with invalid domain field."