loplugin:saloverride

Change-Id: I27600820acb4a432840ef9bc7220fc3d4bb6a273