loplugin:saloverride

Change-Id: I028d6da250bad64cca2d85c8bbf4a3b5a1300f1b