Merge "Update connect() api" am: 867e1aed3a am: ead3d8fbbb

Change-Id: I963ad5b327eed71c4025d2f8a0ce4f04fa3b480c