Merge "code sync with platform/core/csapi/sync-manager"