Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am: df41725e53
am: 53a8774be1

Change-Id: Ie9303bed357327079711ba8809fb05c15b9ec7a6