Merge change Ie2888363 into eclair-mr2

* changes:
  Change SearchableInfo import