Retry on connection failure

Change-Id: I125eb36cdff4ac3d19da2b80126463f7408f7a85