Merge "Fix subnet api test case for non-default cidr"