loplugin:saloverride

Change-Id: I62e8c07faf1fb38b39dfb41e0ba408d5c534312f