Lets assume that e3290499 "loplugin
singlevalfields improvement" enabled loplugin:singlevalfields by accident.  (It
fails miserably for me.)

Change-Id: Id308a17469babae195fa8261d937036b0cc39ff0