Adding localization support

Change-Id: I225bbea17e0bd27bcd4ec9ece2e63f33976fca6d