Merge change 4914 into donut

* changes:
  Make all static methods in SearchManager non-static.