Remove dependency on branch of common-i18n
Fix upload issue