loplugin:saloverride

Change-Id: Ifbcd602203708519f7b4416cf31d94d45b552556