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

Change-Id: I16093f42b297abdd94e97cd26219d86d4a465f09