loplugin:saloverride

Change-Id: I6679d397754f1777441b35910059bda9a917ae2d