Merge "Add skip for api tests" into mcp/xenial/rocky