Merge "[Packagemanager] Fix typo of interop code" into rel/api_4