loplugin:saloverride

Change-Id: Ie85ffc561de858eedafa062a89e0a9983aa20182