Merge "[TF] Fix issue with missing NetworkIpAvailability extension." into mcp/epoxy