Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION where possible."