Fix flaky tests further broken by XMPP ASN change fix.

Change-Id: I66676dc5c72b31d641309226d9e595f1a03f0200