Merge "Update network subtypes info so it is current." into honeycomb