Merge "Creating database without localized collators on NYC and above" into ub-launcher3-calgary