[automerger skipped] Merge "Fixed race condition in data connection" am: 08f0b659ac am: fbbc4af767
am: 36d41a9ae4  -s ours

Change-Id: Ia9f2061708e6ecb927f7d83e02ad61e82e9289bb