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

* commit '582013e092ea0e74277a983f2258203c98109457':
  Revert "Remove searchable metadata."