Merge "Do not test subnetpools in TF case" into mcp/wallaby