Merge commit '2c10b5f483f832523305c11d44035fc7f5d9a54b' * commit '2c10b5f483f832523305c11d44035fc7f5d9a54b': Make all static methods in SearchManager non-static.
Merge commit '2c10b5f483f832523305c11d44035fc7f5d9a54b' * commit '2c10b5f483f832523305c11d44035fc7f5d9a54b': Make all static methods in SearchManager non-static.