Merge "remove the flat network type to support ODL."