loplugin:saloverride

Change-Id: Iabe90321d97b346f8f440ab729eaaec670bf2ce8