One more update to cirrussearch's master

Change-Id: I97f4e3317ab50afd6544792eff6951d03f250e51