HSEARCH-1334 Remove dependency to Guava