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

Change-Id: I6ec7e692f4d5ea70fe92237fb5be494c911efac4