Merge change 7934 into donut

* changes:
  Unhide new SearchManager APIs for Donut.