am 506dd3fc: Merge change 6907 into donut

Merge commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf'

* commit '506dd3fc137df3f002a58ee2edb5b393e1f365cf':
  Initialize searchmanager on demand