am dfb566ac: Merge "Disable Export For Local Search" into klp-dev

* commit 'dfb566aca5254d28c2f84d6628b4050a8781086b':
  Disable Export For Local Search