am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"

* commit '21735e222e0009b1ddcb080faa5b51117d0da879':
  NPE in SearchManager.triggerSearch