Merge "Adjust core-platform-api-stubs-system-modules"