Merge "Fix automatic subnet CIDR generation"