Merge "Fix OfflineLicenseTest not provisioned"