Merge "Fixed race condition in data connection"
am: 08f0b659ac

Change-Id: I723102ed1207d5ca6fd5f5eba944cfae5859d5f1