Merge "Close connection before retrying" into lmp-dev am: a8648ece am: 5181a7ab am: 4b78a795 am: 6d5bc9a3 am: 3272cf26 Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944