am 9e964054: Merge "Remove searchable metadata." into klp-dev

* commit '9e96405486dbe32bc3051053055fade541e22a5a':
  Remove searchable metadata.