There was a deadlock when ConnectionHandler exited the loop in SocketPipeThread, and would call the onFinishedCallback, which called the synchronized method in Forwarder that would deadlock. Changing the Forwarder class solved the issue and made it more efficient. Change-Id: I947450a19573f2e88274b1ebc7b77d4df6afffa7