Updating CirrusSearch to master (ffef180)

Change-Id: I6adb09166ba6994aa050b56964d10e13f16d19c4