Revert "Revert "Search categories"" after the release branch

This reverts commit 24e81478d7d7771d6cccfacef615353dc69a9400.

Change-Id: I39ad1cbe1f8222d70261bb05c9605ca2ec687245
Merge "Revert "Revert "Search categories"" after the release branch"