Merge "Create local clientId instead of sharing one"