Update CirrusSearch to master

Change-Id: I5c4c373d4ceffea84dcc93cdefe4105006d5b2e5