Merge change 23198 into donut

* changes:
  Update SearchManager documentation to reflect latest behavior.