Merge "Fix collation/indexing for i18n contacts"