Fix xmpp connection cleanup.

Change-Id: Ic1349546c0ba8b97340ef314440faf201f897bba