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

Change-Id: I442495aee3fe8815379efc4f039e98c6d61151f1