Merge "[automerger skipped] Merge "Fixed race condition in data connection" am: 08f0b659 am: fbbc4af7 am: 36d41a9a -s ours"