Merge "Add api-versions.xml back to sdk"