Fix double strings

Change-Id: Id1992a7db98a7a993840b8cf52423ef2ad21dd78