loplugin:saloverride

Change-Id: I2b6e6a6654e888bec3ba4961f9130ca10b791f87