Merge "Removing use of private SearchManager api"