Update CirrusSearch to master

Change-Id: I255f1b4fce57afd60d536e18cda33577bcfb56e0