am 5e9a78a8: Merge "Revert "Remove searchable metadata."" into klp-dev

* commit '5e9a78a8353c833ca87434bf0d590027f7f1aedf':
  Revert "Remove searchable metadata."