Fix flaky tests further broken by XMPP ASN change fix.

Change-Id: I429c4453c191b6a24b49c967d35cce25f228dae5