Revert "Search categories" before release branch so it goes with next release

This reverts commit 70fa8cd337c405bc836887e941bc1a7e5ebc45b7.

Change-Id: Id3ec5ad8b2170ecba4aea5bd12f984dee3592b19
Merge "Revert "Search categories" before release branch so it goes with next release"