Merge "Don't accept a user-defined dun-capable connection" into gingerbread