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

Change-Id: Ib9854a5a3c570f648701201594ba74ad29ce487b