L10n tweak and spaces to tabs

Change-Id: Ie1a723051eb47741e50121a71d440fb7dda0d8ca