Merge "Specify the sdk_version of "services-non-updatable-stubs"" into main