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

Change-Id: Ic976be954aa7d67a27c910820a7c45336d8ee2c5