loplugin:saloverride

Change-Id: I2c1033358c546adefa4e280f0b6cb577ee7e3b25