Merge "[Tether04] Migrate EntitlementManager into module"