am ae7a72d1: am a1149703: am 40122b34: Fix failing connection tests.

* commit 'ae7a72d116cf3af9177ec9759ff7b60226b651ce':