[automerger skipped] Merge "Update connect() api" am: 867e1aed3a am: ead3d8fbbb am: 3c350e3ff5 -s ours
am skip reason: Change-Id I8d58aceed87a2df212d4097362369c60a8ec0c08 with SHA-1 4ae2186f42 is in history

Change-Id: I2b52e6e0f4b008d10ca3e7b1332a96d8ca2fcefa