Plug a couple of leaks in xmpp

Change-Id: Ibaa3540cd3e7c30c763fe696c49e42000371a4eb
Merge "Plug a couple of leaks in xmpp"