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

* commit '1bc8fc3de2113b7be9df304309a42276d642a8c4':
  Creating database without localized collators on NYC and above