am 80a56269: Merge change Ie2888363 into eclair-mr2

Merge commit '80a56269482dcc071e1b413baf968509bd9da9fb' into eclair-mr2-plus-aosp

* commit '80a56269482dcc071e1b413baf968509bd9da9fb':
  Change SearchableInfo import