Merge "Fix broken api urls in TypesClient"