Merge "Fix addAuthToken api"