Merge "Tweak testCloseDuringConnect" am: 8aa4525d50 am: 80274c12e5
am: 7d7db097d0

Change-Id: I490b4548424b7a6064f10973d31ca694a9070f6b