Update CirrusSearch to master

Change-Id: I2c44727d5232b026cccc3bc53345ca4c112e3bb0