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

* commit '67053ab96225909820a7e83dc0b3351d43325ea2':
  Revert "Remove searchable metadata."