792989cc8f
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken * commit '16419aca40e9d570eef4f51133ba1b734d3012c0': Guard against NPE in SearchManagerService