Update CirrusSearch to master

Change-Id: Ia100e8308471780bd63170a3584dbca166487ae9