Merge "Move PrefixSearch classes to own files"