nlwiki gets Cirrus as primary search

Change-Id: I3eadd288e446c951599dc70d5d929ccf8e794a17
Merge "nlwiki gets Cirrus as primary search"