Merge "Fix to return data connection state"