Switch non-wikipedia to Cirrus weighted all field

Change-Id: I60c20518230465549785e056e0662da3d6a9f22e