Last commit reverted i18n changes

Accidently the last commit was autdated in case of i18n. Reverting changes
to bring it back to the lastest i18n state

Change-Id: Ic6511cd59b7cad76ff870d6aaaab81f6852349a9