loplugin:saloverride

Change-Id: I2f818c865345c9396b3292d9bf0f8520556223e1