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

* commit '642d04ca3878640ab1e454c45ee00d3a35b82e19':
  Remove searchable metadata.