Fix XMPP uts.

Change-Id: Ib750a3d7cda2b1e0c594d0714539ce703503c24d
Merge "Fix XMPP uts."