Fixing String duplications

Change-Id: I5fe2b85d76683b1d31ff3555de552cd76340b204