Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread