Merge "DO NOT MERGE Always set/remove default routes." into gingerbread