Localize parts of base that weren't

Change-Id: I9b6189e84ab8e4e13a91646919d93dca1804710d