am 5ad0d55d: am 80a56269: Merge change Ie2888363 into eclair-mr2

Merge commit '5ad0d55d4a24a92d51fa6675150b62ccf468789c'

* commit '5ad0d55d4a24a92d51fa6675150b62ccf468789c':
  Change SearchableInfo import