am f2331a6: Merge change 1063 into donut

Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c'

* commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c':
  Refactor SearchableInfo.