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

* commit '442dcb1761f5f200c12c3f86409f780fbcf20e51':
  NPE in SearchManager.triggerSearch