Merge "Fix adding of default route." into honeycomb-mr1