Merge "Fix the adding of host routes." into honeycomb-LTE