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

Change-Id: Ie88e59fb780e23c063bd2abf0daf53d6f6cbf56a