Merge "Fix Default route after secondary net use." into gingerbread