replaced implementation with Guava Joiner

Change-Id: I57af4e4a05622dee454d34d5f42217cd3970e4f2