loplugin:saloverride

Change-Id: I53a7cd73ff754bf3b019cb36341b2ab09c61e762