Merge "Service client modules in identity __init__"