Finally fix data connection

Change-Id: I952f482b97351ec89acc0bc61ff3dd99452289c4