Merge "Remove deprecated entitlement API"