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

Change-Id: I24038dbbf56548ffcb6ae66da47547df3d47eb52