Merge "Moved SearchController into its own class."
am: cf650a3e8e

Change-Id: I2d55f4e3b0b45ae947ad2040e722aba9c1b1496f