am dcf323ad: Merge "NPE in SearchManager.triggerSearch"

* commit 'dcf323adaf3d59fb720dc534380090f9df3a618c':
  NPE in SearchManager.triggerSearch