Update CirrusSearch to master

Change-Id: I193405f6ffafe8fd8be4648735b0c2c5d26406af