Merge "We should break from loop after getting connected." am: 53171e5f97
am: 646a70b1fb

Change-Id: I2fe5ce1bd66c893f3dec4ef8eb8458f935f917ff