am 27f0dcfc: (-s ours) am bd2fd8dc: am 053f3c5d: Merge "Fix searchsnippet highlighting in People" into klp-dev

* commit '27f0dcfce3cf02fe1e49d75dde63c3e81922c8e4':
  Fix searchsnippet highlighting in People