Fix localization issues with disabled

Change-Id: Iba63b50000f546a1e323c855462841e82fce4df8
Fixes: 27948378
3 files changed