Updating CirrusSearch to master (ffef180)

Change-Id: I8db75d283981ed844904f97397d61796411f9a44