Update CirrusSearch to master

Change-Id: Ia85e309b50084390802edb70e13525301a12f589